Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 25 Nov 2011 20:35:39 +0000 (12:35 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 25 Nov 2011 20:35:39 +0000 (12:35 -0800)
commitf4c1aed6eb9df9c1c97bb9f7c053cbe150bd463e
treeefda717d4f776c2ca9ba958b46142ea2c0f65799
parentac2e9131b4223fcc38e49d4e51479a0b75e0945d
parent0cb69496ef1217b5d03357571375f7f23abce880
Merge from trunk.